Skip to content

[Backport release-24.11] zulip: build package from source#362394

Merged
JohnRTitor merged 2 commits intoNixOS:release-24.11from
nbdd0121:zulip
Dec 25, 2024
Merged

[Backport release-24.11] zulip: build package from source#362394
JohnRTitor merged 2 commits intoNixOS:release-24.11from
nbdd0121:zulip

Conversation

@nbdd0121
Copy link
Member

@nbdd0121 nbdd0121 commented Dec 6, 2024

This is the manual backport of #279545, automatic backport of which failed due to #358620.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@nbdd0121 nbdd0121 requested a review from JohnRTitor December 6, 2024 12:48
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 6, 2024
@JohnRTitor
Copy link
Member

@ofborg build zulip

Copy link
Member

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot to mention this on the other PR, but this can likely build on aarch64-linux as well. Could you try changing the meta.platforms and check if it builds on aarch64-linux? @nbdd0121

@nbdd0121
Copy link
Member Author

nbdd0121 commented Dec 6, 2024

It builds fine, although probably that change should be a separate PR to master and then backported?

@JohnRTitor
Copy link
Member

Yes, that's what I was asking for. Let's hold off on merging this one, just open another PR targeting master with the meta.platforms change. After that gets merged, cherry-pick the commit here.

Copy link
Member

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cherry-picks should be done with the -x flag.

Copy link
Member

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please cherry-pick 2160e7d instead, it is recommended to cherry-pick exactly the same changes, else issues may arise during future auto backports. I would suggest you leave the wayland-ime and env change as it is.

https://github.com/NixOS/nixpkgs/actions/runs/12203255621/job/34045797277?pr=362394

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Dec 7, 2024
@ofborg ofborg bot requested a review from andersk December 7, 2024 11:57
@ofborg ofborg bot added the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label Dec 7, 2024
Currently this uses AppImage which comes with its own electron and
then we run it under FHS. This is not ideal since:
* it suffers from "too many electrons" issue
* we are relying upstream to bump electron version for bugfixes

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
(cherry picked from commit 2160e7d)
(cherry picked from commit 29d7565)
@github-actions github-actions bot removed the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label Dec 10, 2024
@ofborg ofborg bot requested a review from andersk December 11, 2024 15:21
@ofborg ofborg bot added the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label Dec 11, 2024
@JohnRTitor JohnRTitor merged commit e298351 into NixOS:release-24.11 Dec 25, 2024
4 of 5 checks passed
@nbdd0121 nbdd0121 deleted the zulip branch December 25, 2024 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants